[Task] Server/Client_Fix Bugs

### **ISSUE**

- Group: `client`, `server`
- Type: `bug`
- Detail: fix bugs

### **TODO**

### **Estimated time**

### **`3d`**

### **Labels**

- Estimated time: `E: 3d`
- Group : `client`, `server`

- Urgency: `High`
