Even More minor fixes to build