Fixing several bugs

Bugs are :
- 4378
- 4389
- 4459