Derp fixes
Merge pull request #202 from GrahamCampbell/derp-fixes

Derp Fixes