revert "Revert "A couple of changes for the build"