Fix some validation warnings.