Some minor tweaks for Django 1.5