Heri | #3436 | Fixing some minor defects