Fixes for demo issues in plot and grid.