Fixup default virtual servers and policies to use &references