Fix cleanup mistakes