typedef variable fixes