Some changes before commit to heroku