Fix two regressions where language would not change in installer, and where language would reset to english in the middle of the install process.