Multiple file handling fixes