Fixed up remaining plurals that should be singular