Fix engine typedefs