fixing more django compatibility issues 2