misc. corrections in service migration

Miscelaneous minor corrections in service migration processing.