Support for VS2010, tweaks