Fix some issues with gender-neutral language