Fixed the shipping validations