UserType Fixes