Fix bugs so unit test DeployFullService succeeds.