Fix some more building hiccups