Fixed python2/3 imports by going through six.