Various fixes
Merge branch 'master' of github.com:Block8/Octo