Some more work on fixes