Updated demos to work with the latest framework changes.