Heri | #3395 & #3396 | Fixing a couple of small bugs