Minor bug fixes
Merge branch 'master' of https://github.com/cgravolet/crapnotcrap