Mathias changes for Windows