Fixes for using incorrect y values for scale in plots