Fix couple small issues
Merge branch 'master' of https://github.com/mattbreckon/Vanilla