Add back mkfmap, mkT1avg, etc