KFSPTS-3482 Add small fixes