[{FIX] a few corrections