Misc fixes
Merge branch 'master' of https://github.com/n1ck3/sonar