Validation expression fixes.