Fixed heroku deprecation warnings