Fixes for extended length paths