Some adjusts and config heroku