Fixes and localization
Fixes