fixes for validation