Fixed a few more problems that cropped up while revising manual and
testing manual code.