Fixed external commands and filenames