Shipping

Shipping fixes from Luz