Fixed some windows issues