Fix minor RT bugs 83175 and 86455.