some fixes to do per user.