Adding some more stuff for Heroku
Consistency fixes
Merge branch 'friism-patch-1'