Minor fixes to Andy's patch merge voodoo