Cue fixes, CalculateRPC