Some bug fixing in axis scaling.