Various tweaks to demo models