Fixes for Heroku Push