Fix GSS, fix router links