Fix label spans