Fixing issues with requirejs and dependencies