couple fixes to demo build