Fix struct type creation