Quick adaptions/cleanups for packet level checking.