Minor path finding cleanup