Demo fixes