MULE-7468 Resolve compilation errors due to refactoring