..F....... [ZBX-8196] misc code fixes