Some more building fixes