Fix nested types, I hope