Fix some broken demos

Mostly addresses #474