Fixing issues that occured for current django trunk.