[#2990] Minor tweaks to new validation overriding instructions