agent: Minor cleanups