Update for compatibility with Windows