Fixing several minor bugs

Bugs are :
- 4372
- 4493
- 4497
- 4499