File/folder fixes