Build: removed flatten: true when building demos
Build: demo fixes since no longer flattened