agent: Fixing problems caused by merge

Additionally fixed problem with vectors.