pull winston's tiny changes

pull winston's tiny changes