more fixes to work on current Moodle master