Correct some tails after user model
Some tuning for heroku