Improvements on validations.