...G...... [ZBX-8031] corrected some more variable declarations and parameter passing to functions