Fixed the build, and addressed some code reviews.