Fix compilation of demos/shapes