Minor fixes to make the project works with Django 1.5