Fix dtors (Ianna's patch)