[FIX] Small fixes