minor fixes for validation