Fix some small things
Merge branch 'master' into mafiastats