Updated further demos to compile after previous commit.