Fixed remaining path limit issues