Some minor fixes for MinGW compiler
Merge branch 'master' into auto_ptr