Fixed overrides for new deface syntax and _shipment_manifest partial