..F....... [ZBX-2603] more cs fixes