Fixes to get language pack building working properly (for English et al).