Fixes for new-shape of TypesmartFactory