more minor tweaks for heroku/devise issue