Fixed Heroku Issues