Changes to ValidatePKFields