Made some fixes to Company and StockExchange