Minor fixes
Merge pull request #156 from GrahamCampbell/fixes

Minor Fixes