Further Fixes to main-Django