Fixes and use django-environ