Fixes (demo and internal).