First attempt of pull request :-)

These caused errors in MSVC++.