Fixed various bugs with manual downlaod