Merge pull request #1496 from mathstuf/minor-fixes

Minor fixes