Validation Fixes