Fix @Nullable/@NonNull annotations