Misc; Minor demo fixes for release.