Validation error fixes.