More consistency with manage.py