Fixed up annoyances with deletion