Some modifications to get working on heroku