Fix up roomservice