agent: Post-merge fixes.