Fixed packet-related stuff