Merge "Fix type annotations"