Windows Build Errors fixes