Some tweaks in file list