More fixes from the requirejs switch