Fixed issues with Windows' compiler.

Same as with other branches...