Bugs very small rc4 fixes

These the simpler, clean fixes from my last PR.