Minor fixes
minor #815 Minor fixes (GrahamCampbell)

This PR was merged into the 1.3-dev branch.

Discussion
----------

Minor fixes

Commits
-------

0245ce8 Minor fixes