Fix tuples on nested types