Bug fixes + django-admin support