More delete button fixes