Bugfixes with guided deletion