Fix deleting
Bug fixes