fixes in ch7, requirejs plugins