More fixes for packet processing of xscope data