Fixed Heroku Compatibility
More heroku fixes