Various XACT fixes
More RPC code reading...
Merge back from master