[FIX] Some adjustments