Small updates to support modern versions of Django.