FIx django admin error, cleanups