Selected agent fixes.