more 4.2 fixes, grumble grumble