Minor fixes to basic demo