Final changes for Django update.