Minor fix + file management