Fixes for scales in subplots. Fixes #381