Added more fixes from integration issues