Various files: Make compatible with Django 1.3