Minor user model and spec changes