Update for deployment on Windows