Fixes in user area