Last minor fix

Hoping this is the last minor fix on the same subject or this will be a
terrible commit