Further path logic improvements