Small fix user model etc...