[FIX] Some errors