Fix exported collection types