Very minor tweaks
Merge pull request #342 from GrahamCampbell/minor-stuff

Very Minor Tweaks