DeletionFlag fixes