Auth and heroku fixes