Changed headers and packet fields to be fixed