Validation Fixes 2.0