Add a couple type annotations