Various changes during the process of benchmarking, nothing fancy