Misc; Demo fix.