Fixed messages to use proper numbers