Fix agent compile issues post merge