Bug fixes and label fixes