Changes for initial Heroku setup