Fixes for 2d plots (issue #15 from Kostya)