benchmark fixes and improvements