Actually make generic packets work...