Win fix simple

here are two simple fixes culled from https://github.com/matplotlib/matplotlib/pull/3409 in the efforts to focus the review.  I probably shouldn't have batched those items together (not sure of protocol now that I did).