Fix service ensure/enable logic