Progress on some windows issues.