Small fixes on deletion