New tools and fixes committed