Improving Django 1.5 compatibility