More tools fixes
Prevent more error into the tools, fix minors errors