Validation-Fixes