more Quantity fixes