More work on download support.