Validation Fixes 4