Fix up InService wait