Fixing more windows warnings and 1 bug.