Fixes for user models