Fix apparent bugs from server/href generation changes