Couple more manage.py fixes