Two patches for services