Fix for current Moodle + fix for setup.py