Last changes for Heroku