Fix use of mktemp
Change discs path
Replace more shell characters