Tweaked MyEquivalents related tools