Fix typedefs