Fix cleanup failing