Simple fixes + localization fixes.