Demo: minor fixes.