More save label fixes