Some more build fixes