Add missing @NonNull annotations