Build fixes

Minor fixes, to get a clean build out of a fresh github clone