Fixes for VS and codeblocks.