Submitting changes to Yarn Client.

These changes fix a few minor issues discovered during testing.