Minor fixes for translation and initialization