[Minor] Fixes on top of #1679