more fixes for validation