More BMS accuracy fixes.