Resolve issues with cross-imports (OMS-507)