more label fixes