Deletion fixes