Some more last fixes