minor Demo fixes