Packets update and minor fix.