A few fixes
Merge branch 'master' of github.com:mattrick16/OpenBlocks