Several isort related fixed (after isort upgrade).