Core tweaks