Fix Demo build