Formatting & demo fixes
- #2380