Validation fixes
Merge pull request #25 from umpirsky/zone-member-validation

Validation fixes