More fixes to path table, etc