Bug fixes on various delete actions