A fix, some cleanup, and a doc update for the build process