Fixing various validation errors.
Merge pull request #1 from dwcramer/variousFixes

Fixing various validation errors.