Minor post-mid-sprint demo changes