additional fixes for #3 mostly related to Django 1.5.x