Minor changes in ShapesDemo