Fixes and reset db for Heroku
Heroku fix