Resolve Heroku issuess...