Some more tries at fixes