Fixed some windows issues.