Fix some private type export warnings