get demo building again

Some minor changes that allow the build process to run for me on the demo branch.