Small Demo fixes