Change to rd-val and fix check for rd-val on manager calls