Updates due to main repo converted to CommonJS