Minor fixes

corrects mostly minor build failures from the build server.