Download manager - fixes