[Misc] Fix CLIRR errors in build