Fixed some user model problems