Fixing certain issues with gender