requirejs-related fixes