A few bug fixes. Added STI to User.