Add missing property and inconsistent type annotations