Some changes toward Heroku support.