Some fixes to recent strings commits.