Finish up with initial round of i18zation