Fixes for localization and company information refactoring