Some more django fixes