agent: Post merge fixes.