Merge bugfixes from master
Try making the subwave size equal to the number of vcpus on the loadtesters