[FIX] Small changes