Add more nullable annotations
17 files changed