Updates to support release on Windows