Fixed remaining stuff for complete django 1.5+ compat