KFSPTS-3599 add small fixes