Fixes for heroku setup step