r.js build fixes