Download option fixes