Build fixes for Windows / Visual Studio#7

aras-p wants to merge 1 commit intocelerity:mastercelerity/ndzip:masterfrom

aras-p:masteraras-p/ndzip:masterCopy head branch name to clipboard