Roger: fixed Windows-specific issues