tweaks for core lang