Small changes to packet generation.