Add a few more types for Windows