General: Fixes for compilation under vc++10