small fixes and new types after EMC import