Fix adapters for types and type_elements