...G...... [ZBXNEXT-2203] basic stylistic and compilation fixes during initial code review