Thanks very much Gilles  . Could you be so kind as to email me patches for these instead or provide a git branch that I could pull off? That would be most helpful.