more fixes on download