Fix Delete issues