agent: Fixing missed problems