Fix surface deletion order