Fix container removal failing