Fixed issues with Windows' Compiler. Hopefully.