LPS-45997 Fixing compiler errors