Tools bugs fixed