[S02] A few corrections to previous commit