...G...... [ZBX-8545] error fixes and code style adjustments