Some fixes before testing heroku