Minor Moodle 2.6 compatibility fixes