Add servers.
Fix building issues.