Fix type annotations