Fix #475

#475 
Some more "No * yet. Please use ... to add new *" are missing I think. Not sure where.