Fixes for bandwidth and number of cores