Validation merge fixes