BF: few missed import six from external