Some fixes for new structure including company name