Fixed Configuration Tools problems