Fixed remaining path length limit issues