Fixed some small bugs with the windows support.

Review URL: https://codereview.appspot.com/121790043