Some compatibility fixes for django 1.5