Bug fixes on container remove