Fixes in generator to handle languages like 'zh-CH'