Minor adjustments for validation