merges fixes on settings.py