Demos build again. Fixes #224