Fix some misplaced labels