Windows improvements.