Follow-up to demo of fixes