Minor changes in file type handling