Some fixes to packets