Fixed up typedef issues