Fixing QS validation errors.