agent: Rest of replacements.
Another portion of fixes