[Minor] Fixes on top of #1679

Minor fixes on top of #1679.
Btw, it is just a nit - so please dont let this block a commit !