Some labels fixed