Fixing some demo details