Demo fixes (relating to removal of JQuery)