Fixes to UserId.