Tweaks to make it build with latest boost as well as visual studio 2012