pathivar fixes