Fixing tools scripts