LPS-48961 Fix compilation issues