Fixed a couple demo compile issues.