Improve Windows and Android support.