Fix packet E6 and recv errors from refactoring.