Misc fixes
Merge branch 'master' of https://github.com/thenewcircle/class-3580