Fix some windows issues