Fixes to cope with latest Dijit changes.