more patching to get demos wording in py2 and py3