Some bugs that are present in tools have been fixed