Fixes from merging repo for two-axes.html and logscale.html.