fix struct types