Cosmetics
Fix a bad path in exception handling
Another path fix
Rework the base Xaraya paths