Some core tweaks.