More defect fixes.

Finished performing preliminary integration testing for all goals
completed so far.  Found, logged, and fixed a few defects related to
these.