Minor fixes in translator