Ironed out localization issues