Heroku fixes for engines