Am few more heroku fixes