More minor fixes to build