Fix some missed six imports (using django.utils.six now)