changes needed for activerel

Just trying to sneak these in with your merge into master. I have a few more adjustments that prevent some duplicate queries that are still broken as a result of some of the refactoring in Transaction. Not sure where but I have an idea, I'll mess with it later. These are the crucial ones.