Fixed all packet issues