additional fixes for Moodle 2.5