Corrections for compiling issues in Win, And and Doc