some fixes for missing names