Function tweaks.