Fix some issues with sign by proxy replacements.