Fix lack of message pluralization