#279 Fix tool paths