Minor cleanups to recent PRs (commit: f2a556f)
Minor cleanups to server links handling (commit: 6481678)