Updates for demo

A collection of fixes needed for WCH demo. See commit list for details.