Fix agent info issues