New tools and fixes