Various changes to make heroku work
who knwos