Pending minor fixes.
Merge pull request #1526 from tklein23/minor_fixes

Pending minor fixes.