Minor fixes for demo