Tweaks for redeployment to heroku