[Minor] Fixes on top of #1679

Minor fixes on top of #1679.
We do the double slash in other places as well. Changing those too would touch upon things I didn't touch in #1679, so I'd rather keep the changes in this PR at the minimum while keeping the code consistent with the other places in this file