Packet fixes

fixes #4