Minor fixes

corrects mostly minimal build failures from the build server.