Update and id fix