KFSTI-677 fix compilation errors