Minor tweaks for Windows compatability.