minor fixes to build