RPN level 821 fixes