Fixed edge cases in extending tool options