More prod fixes, preparing for heroku