Update ResourceLocalizer according to PR comments