Fixes for users