Few more import and settings.py changes