Fixes and localization