Fix some windows issues.