more fixes, grumble grumble