[FIX] Quickfixes and labels updates