a few label fixes