Fixing CompareToInstance and CompareToSet methods to account for fields as well