LPS-50210 fix compilation errors