Minor fixes to demo configuration