Additional fixes to prepare for proper heroku deployment