Some minor FIX (1.1)