Fixed analog/digital scale issues