Fixed type annotations