Fix plugin mappings which require leader
Shim SSH and SCP
Add servers