Fix composed type issues