B#947 Checkout Shipping Page Issues - Fixes