Shipping and ensurace info fixes