Fixes for shipping calculations.