Fixed various localization bugs