Minor fixes in demo