RC4 update and fix