additional django 1.5 compatibility fixes