Fixes for step and mapping mode Average display