Fix bugs found

Fix bugs related to messages and numbers validation.