[FIX] Some issues