Changes to typedefs