Minor Demo Changes