Add some extra paths and detect zero executable in case it's moved