fixes for user