Properly handle conversion of instances to PKs in updates