Correct some potential bugs with 9.3 protocol