LRDCOM-11488 Fix compile errors