Fix $NON-NLS-1$ comment issues