Various fixes to demo models