Hopefully make the Object Browser more stable.