Adjusted new max path length limit at other places as well.