Resolved remainder buid issues on Windows Server 2008