Fixes for all Moodle context!