A couple more adjustments to active link code