Minor changes in tools