..F....... [ZBXNEXT-2222] minor code corrections