LPS-42727 fix compile errors