Fix demo stuff.