Minor (but necessary) changes to the ClientRunner.