Fixed some bugs to make newer compiler happy, updated benchmark data.