Changes in validation messages and fixes