fix handling of removed objects and some messages