For Demo fixes