Always use bert. Fix bug on wizard demo.

Also make simple comet demo be tolerant of code changes