Fix to accept input files from generic locations