Some improves in django 1.7 support