Minor updates for demo project