Couple more optimizations.
More optimizations in bandwidth.