Er, actually commit demo prettification fixes

Test Plan:
<see below>