[FIX] Minor adjustments