tweaks to play well with the new taxomachine instance