Helios working with requirejs, small other fixes