Fix a few more dependent delete cases