Various minor adjustments debugging for Windows