Fix service/host relations