Minor bug fixes for new plot layout, etc.