Fixed demos relating to the latest framework changes.