Clear up problems with compatibility. Works with Django 1.4.3