Build: demo fixes since no longer flattened