Some more tweaks to fix heroku