fixes for django 1.4 support