Minor validation adjustments.