Various download fixes