misc fixes for the grid demo