Minor fixes after visual regression testing.
Fixed regression after final testing of Highstock, new fix for #1851 and #2238.