Fix typedefs
Don't use ! in types