A few updates for the windows branch