Fixed some Windows8 issue.