Fix some structures.