Bug fixes with Labels