[FIX] Correct some bugs with V7