Some more cleanup and trying to get the build to work on all development machines