Fixes for user-role creation