Fix RPN bugs.