Fix up toroplus and maguro builds