Lots of fixes so that django admin export works with this