Non-IR constants minor tweaks