Fix InfoCommon