$NON-NLS$ tag fixes