some tweaks to toby_*