Some more packet bugfixes