Minor adjustments and validations.