Fixes for issue #134

Fix compilation on Windows with Visual Studio 2010