Fixes for new zealand checkout issues.