Some minor changes to make localization and other stuff easier