Add some nullability annotations