Heroku prep
Fixes for heroku builds.