Fixes for node contexts and DOJO mix