Fix: Miscellaneous fixes for multicompany