A couple of experimental fixes for validation.