More bug fixes for rc4