file and folder fixes