MOAR FIXES for heroku