Build fix for OSS 4.x version