Fixes for validation.