Fixed windows build issues.
Fixed linux build issue.