Demos: Cleanup and error detection