Attached are two more patches to add to the stack.

-- 
Richard