fix bugs due to demo edits