Agent: ETrace small build fixes