fixes to get the demo working.