KIJIMR-34. Compilation fixes.