Improve validations on checkout