more extractToWaste fixes