fix incorrect typedefs