Clean up check_consts
and misc fixes
#119072
Merged
check_consts
and misc fixes
#119072