Switching validation mode to fix validation errors