Sorry, here are the three promised patches.

-- 
Basil