Fix type defs