Minor Django 1.7 compatibility changes