Some XPiNC-related fixes