Changes for working in heroku