more getprimary fixes