Some fixes as tool was not downloading the latest version only.