fixed typedefs