Fixed problems in Demo class