Few tool updates and mini fixes