Did more stuff to make Heroku happy