validation messages fixes