Fix Download activity for different types