more pcmk remote and cts fixes