Fixes for heroku
Fixes for heroku part 2
Fixes for heroku part 3
Fixes for heroku part 4
Fixes for heroku part 5
Fixes for heroku part 6
Fixes for heroku part 7
Fixes for heroku part 8
Fixes for heroku part 9