Fix two test failures with Django 1.4