Fixing validator issues