VS2013 fixes, temporarily swap out boost::flat_map