Tweaks to fix some unnecessary validation logic
Resolving conflict