Patches attached.

-- 
Frank Plowman
https://www.frankplowman.com/