unexport some defs