[master] fixes for heroku deploy