Fix other issues stemming from input filenames containing spaces
Remove unused import