Fix various regressions from yesterday with the busses and peak meters...