Validation Fixes

Fixes several server-side validation bugs.