Various tweak to path elements, more debug logging