Bug corrections in ServiceHandler