Any way to avoid this in order to fix the module imports, which seem to confuse Angular?