Attempt to fix issues created by Heroku PostgreSQL
Another attempt at fixing Heroku issues