More fixing
Empty names are bad too.