Fixing stuff for benchmark.pl... not perfect yet