A bunch of fixes to get servers to link