Merge some tweaks for the VS 2008 build