Fix toroplus, toro, etc