Fix Server/Client

Fix packet crash
Fix merge
Fix merge 3