Some packet/payload fixups.