More works on Windows port