Some more packet fixes.