Fix some issues with module install failing when zip file hasn't
downloaded correctly