Fixing demos