fixed some additional string externalization