Fixed a build problem from the last commit, along with a couple of other
things missed.