Fixup some stuff with packets