fixes for toroplus